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

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