[automerger skipped] Merge "MediaMetrics: Suppress device names am: 74daafd4...

[automerger skipped] Merge "MediaMetrics: Suppress device names am: 74daafd4 am: 924eccfd am: 99fa8ed3" into rvc-qpr-dev-plus-aosp am: 15fba466 -s ours

am skip reason: Change-Id I16a85c514a8a8db02f44a512b90fd0a5896976af with SHA-1 74daafd4 is in history

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

Change-Id: I3a6a2a19859f59d920d79ab9d7f7c1f008388d8d