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
* commit '9745ea35':
Put disallow-safe-boot restriction to system settings to make it accessible during boot.
Change-Id: I2d6e50105de5585a073dc789e6ad9ce998730456