Merge "Block adb from changing certain settings value when corresponding user...
Merge "Block adb from changing certain settings value when corresponding user restriction is on." into pi-dev am: aecd9616
am: 19d708a0
Change-Id: Id59ef400903dbe8328955f18269e828271f39fbd