Merge "Merge "Add device info for filtered players" into rvc-dev am: 3c336c4b64 am: dddf25ee3f" into rvc-d1-dev-plus-aosp