Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b am: 0bf4463e

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

Change-Id: I4e9becf0ce7bdfc11937533219bcdd48ebbe2231