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: cea05d44

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



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