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

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



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