Merge "Revert "Block adb from changing certain settings value when corresponding user""