Merge "Merge "Updated: always show the keyguard on device lockdown" into udc-qpr-dev am: db9f9d7658 am: 82107029a7" into main