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

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

Change-Id: I0155d731a00674b66369136e3421a8cf823667c1