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

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



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