Merge "Block user from setting safe boot setting via adb" into nyc-dev