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