Merge "Add flag for running auth over keyguard occluding activities" into...

Merge "Add flag for running auth over keyguard occluding activities" into udc-dev am: 2b127f9c am: 4b12e0bb

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



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