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

[automerger skipped] MediaMetrics: Suppress device names am: 74daafd4 am: f2bc0459 am: 18afee4c -s ours am: 58f81f11 -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: Ie1bebc35914f28208f11ad89b02fefc85cf48752