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 am: 874bd82b

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



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