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

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