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 am: 7eec1943

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



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