Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp
am: 23456e3844
* commit '23456e3844e2b54c5003b777b34ed5d8806eea1b':
Change-Id: Ida6baacccfdcc11b5a9316ca8b7a20526bd88c60
This commit is contained in: