Merge "Merge changes from topic "keyguard-occlude-race-transitions" into udc-dev am: a3bd224e" into udc-dev-plus-aosp am: 959d6f9e

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



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