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

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

Change-Id: I33ec7701057eef9380799dcd4372c26f516d8d3f