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

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



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