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

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



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