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

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

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



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