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 am: 6201c25a

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

Change-Id: I8cd3a65fc8f736bd959bcae8946fa0e86b02ef8a