Merge "Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am: f97faada5d am: 6b69f6597e" into nyc-mr1-dev-plus-aosp