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: b0b56e6e am: 4ff9cd0f

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

Change-Id: Iee99c7833efc781c991c0148175486d100f77f05