Merge "Add explaination strings to bouncer if biometrics timeout" into...

Merge "Add explaination strings to bouncer if biometrics timeout" into tm-qpr-dev am: cf49d6f4 am: 4486290a

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



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