Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am: f97faada5d
Change-Id: Ifba1f49a4411450cbe782fc2a1aded6bb7e4c186
This commit is contained in:
am: f97faada5d
Change-Id: Ifba1f49a4411450cbe782fc2a1aded6bb7e4c186