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

* commit '5680f9f6d669e7d2f45db1027d53359b9ad327ff':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing