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-d1-dev am: 5a1f3564 am: 2f70133a

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



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