Merge changes from topic "am-d2f9204700b74fe8b08cf61658fc359c" into tm-d1-dev-plus-aosp
* changes:
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
DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor am: 29f4d114 am: fedde47d