am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"

* commit '8ea98a8a464fbac720ff3906cafc9e23be5e94b5':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"