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

Change-Id: Iecce325f92455edfac8065a843dacf2f938bb560