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

Change-Id: I1adecc989ee77fe578e08b484edc57669937df99