[automerger skipped] Merge "DO NOT MERGE: Fix Budget bakers wallet app's...

[automerger skipped] Merge "DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor" into tm-dev am: 021ef9a6 am: c3b378bf am: 097765f4 am: 944b2847 -s ours

am skip reason: subject contains skip directive

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



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