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: I2698170e17e00dd64f1ca382a350e4f00cc17ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>