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: 017c1265 am: d9e3a829" into udc-dev-plus-aosp am: 1247f61b

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



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