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 am: a4c10108 am: b76aa517

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



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