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

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



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