Merge "Reset the keyguardGoingAway flag when keyguard is not dismissed." into...

Merge "Reset the keyguardGoingAway flag when keyguard is not dismissed." into tm-qpr-dev am: c4c302a8

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



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