Merge "Merge "Fix circle is cut off in BiometricPrompt" into tm-dev am:...

Merge "Merge "Fix circle is cut off in BiometricPrompt" into tm-dev am: c9e086ad am: c2f80349" into tm-d1-dev-plus-aosp am: 4fb31ed9

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



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