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: I3b42a19319029819f01e14b3b828d8348b46178a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>