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

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: 017c1265 am: d9e3a829 am: 7825ac29 am: 8ccaed31 am: e2672b07

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



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