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

Merge changes from topic "keyguard-occlude-race-transitions" into udc-dev am: a3bd224e am: 2a31bda6 am: 43188e97 am: 9d693a44

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



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