[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: 7a450c60 am: 8377679f am: 6d392d90 -s ours

am skip reason: subject contains skip directive

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



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