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: 21be5a45 am: 8fb2b0a1

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

Change-Id: I14f1b1fb940eacfce31278f5b7dcf6ac07a07445