Merge "[Injection] Stop using the component icon as a fallback option" into...

Merge "[Injection] Stop using the component icon as a fallback option" into sc-dev am: 361ab7e1 am: f5139fdb

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

Change-Id: Ie3f90a3cda546df91f448c601655127779aeecd0