* commit '0a5e18bfe23f4b256bbda995a1f3e383fa979ee3': Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
* commit '0a5e18bfe23f4b256bbda995a1f3e383fa979ee3': Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"