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

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



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