Merge changes from topic "explicit-keyguard-occlude-flags" into udc-dev am: a4e114a8

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



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