Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't...

Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6 am: 7a450c60 am: 8377679f

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



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