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