Merge "Explicitly re-show the keyguard if we were hiding." into tm-qpr-dev am:...

Merge "Explicitly re-show the keyguard if we were hiding." into tm-qpr-dev am: 600c1d8a am: 2c4871b1 am: 53d517c2

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



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