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

* commit '0e7b34202a18bda1a7848a02f544250f2665ab4d':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing