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: b94543c6 am: b0cc681d am: 9977f9b5

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



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