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: bc6f937d am: 38080c8d am: 0a1ab432

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



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