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

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

Change-Id: Ibdd7ce9ead57a7970baa312bacfad2b84b6f7c5d