am e385d26f: am cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit 'e385d26f':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission