Merge "Start a new keyguard session on device sleep" into tm-qpr-dev am: 98ad6693

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621514



Change-Id: Iefecf0ed3c4b9d15a0f2e6a6b2a913bafdd9cd52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>