Merge "Explicitly re-show rather than reset keyguard if we're not...

Merge "Explicitly re-show rather than reset keyguard if we're not interactive." into tm-qpr-dev am: e8072d98 am: 5d809fb7

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



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