Merge "Merge "Don't dismiss app if auth is from screen off/AOD" into...

Merge "Merge "Don't dismiss app if auth is from screen off/AOD" into udc-qpr-dev am: a54f0b40" into udc-qpr-dev-plus-aosp am: e61f437c

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



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