Merge "Reduce device fallback to just icon" into rvc-dev am: 1d53e823 am: 8f70c6d7 am: 9ed69bd2

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

Change-Id: Ibda902963ddb7b4e403c4b3f2f5fcb2a1839f961