Merge "Use proper package name and UID when checking write settings access"...
Merge "Use proper package name and UID when checking write settings access" into nyc-dev am: b707db0f
am: 12d00a7e
* commit '12d00a7e':
Use proper package name and UID when checking write settings access
Change-Id: Id28af44094cfd30aa3b745ec0f3f99acd9a0c1a0