am 4ce9ebea: am bb1a1e5f: am e2835f9f: am 212c006e: am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev

* commit '4ce9ebea91be2456f5958b86e1c7e36b800e8dde':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission