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

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

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