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

Change-Id: I8f2fad8933d62c0424632c7fcd5e158aa1b0d4bf