Merge "Fall back when failing to load size restricted icon" into tm-dev am:...

Merge "Fall back when failing to load size restricted icon" into tm-dev am: 44df60c3 am: a2df5792

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



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