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: ffc1a579

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



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