Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 99e5285425
* commit '99e5285425962f61d7b17dbb0f01471e3a8f2932':
Change-Id: Id0f502c4093c7d48f4ec41c75e070c64df791298
This commit is contained in: