Merge "Merge "Do not load drawable for wallet card if the card image icon...

Merge "Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607 am: cb2ad187 am: 53f1f461 am: c3ef945b am: bc6f937d am: 38080c8d am: bba308b2" into udc-dev-plus-aosp am: 3cdff2e5 am: bc35a4cb

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



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