Merge "MediaMetrics: Suppress device names am: 74daafd483 am: 924eccfd6f am: 99fa8ed310" into rvc-qpr-dev-plus-aosp