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

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