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: 311caa46

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



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