am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with...
am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit 'f83e8526':
Bug: 22879202 App compatibility with WRITE_SETTINGS failing