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

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

Change-Id: Ia6bdb9b684f7b2d6ed442f83816b38d3e0af043e