Merge "Merge "Add device info for filtered players" into rvc-dev am:...

Merge "Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b am: dddf25ee" into rvc-d1-dev-plus-aosp am: ca56ffb1

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

Change-Id: I399597427f951bc13e018cc205729259911a8c24