Merge "[automerger skipped] Merge "On device lockdown, always show the...

Merge "[automerger skipped] Merge "On device lockdown, always show the keyguard" into rvc-dev am: cc94a537 am: efb376fe am: d0888dab am: 23532ed5 -s ours am: 9c98f29a -s ours am: 0674452b -s ours am: 3f9b491d -s ours am: 191919c4 -s ours am: 218abb01 -s ours" into udc-d1-dev-plus-aosp