Merge "Put disallow-safe-boot restriction to system settings to make it...
Merge "Put disallow-safe-boot restriction to system settings to make it accessible during boot." into nyc-dev am: 9745ea35
am: cdd6e3aa
* commit 'cdd6e3aa':
Put disallow-safe-boot restriction to system settings to make it accessible during boot.
Change-Id: I2d57356816ff3088907bed2621dc25f513477d1b