Merge changes from topic "am-be4739ff5b074395a60f969cd98289b5" into main
* changes:
[automerger skipped] Merge changes from topic "cherrypicker-L93200030008016034:N39700030132979086" into udc-qpr-dev am: 89dd5253 -s ours
[automerger skipped] For the wallet card & icon, only allow the drawable be loaded from bitmap. am: 15c02aa5 -s ours