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

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