am 8b095b1c: am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev

* commit '8b095b1c19ac9316c649a0831383e9956ccc61d1':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing