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

Change-Id: I2e3d13a01d8d2443c522a6b611b8c1068aebd5f6