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: 0bf4463e" into rvc-d1-dev-plus-aosp am: a362eaf8

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

Change-Id: Iaeba502449bebf7591f4f537b32b9db9196a4fd5