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

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



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