am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev

* commit 'be6bfb4c910e02d7e18b732d7f9cf09d5b3e94a7':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)