Merge "Check isInteractive after traversal before hiding keyguard." into...

Merge "Check isInteractive after traversal before hiding keyguard." into udc-d1-dev am: 1592cec3 am: b7bfe91c

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



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