Merge "[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8 am: 581a3fe494 -s ours am: 9e9cdd8efe -s ours" into udc-qpr-dev-plus-aosp