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