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

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