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

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



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