Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607c8 am: cb2ad18704 am: 53f1f4613d am: c3ef945b91 am: 017c1265ac am: d9e3a829b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599577 Change-Id: I7bfd7a74ab8376cf218a16385aa480455faa75dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: