Merge "Block adb from changing certain settings value when corresponding user restriction is on." into pi-dev