Merge "Merge "Add dump info for biometrics auth dialog" into tm-d1-dev am: 59bbad9c am: 0857c5c7" into tm-qpr-dev-plus-aosp am: 14016cc4

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



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