Merge "[automerger skipped] Merge "Updated: always show the keyguard on device...

Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51ea -s ours am: 4f2e9968 -s ours am: 0ef05eed -s ours am: 2160024d -s ours am: fa1bc4a7 -s ours am: 8ca3fb34 -s ours am: d4527635 -s ours" into udc-qpr-dev-plus-aosp