Merge changes from topic "am-6e211d057385482094e3c15ffd4b3efe" into tm-qpr-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 am: 87306bd5
DO NOT MERGE: Fix Budget bakers wallet app's fingerprint icon doesn't line up with sensor am: 29f4d114 am: fedde47d am: ad34cc48