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