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

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



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