Merge "Block user from setting safe boot setting via adb am: 0ff13fce6f am: 36eb7a1370" into nyc-mr1-dev-plus-aosp