* Simplify the logic in the onDisabled() receiver. Make sure security policy keys are *always* disabled. * Eliminate unused variable and unused receiver. Bug: 2576145 Change-Id: I3665a1d300edfb77e02737c08aee22bc977f4968