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

* commit 'bb1a1e5ffdbf3749f3208d570945c4bcb5ecba3f':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission