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: 2146b25c am: 56f3fb2c

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



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