Merge change 520 into donut

* changes:
  Enforce permissions for PhoneStateListener events.