Merge "Avoid keyguard fling transition interrupt for timing issue" into main am: 2a4e99a798

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

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