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

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



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