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

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

Change-Id: I5ce61f386926ea6281d99053b1f1a6a05607e249