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

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

Change-Id: I24db15d5aaa1d77e55c465dfe26ce59600c4e77d