Merge "Reduce device fallback to just icon" into rvc-dev am: 1d53e823 am:...

Merge "Reduce device fallback to just icon" into rvc-dev am: 1d53e823 am: faea9c30 am: d778a46d

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

Change-Id: Ib2cfd9685dfbe6b70659f05e4b41b8e58ddd1e38