Merge "Re-enable biometric prompt tests." into tm-dev am: 0bba5194 am: e6750742

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



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