Merge "Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356 am: 5faa5ab6ea" into oc-mr1-dev-plus-aosp
am: 1b032d9d39
Change-Id: I6436186aa68674d20537aefcbb5837a68fc73967
This commit is contained in: