tree 8563dcb399d7d4eec4fc0940348281f2c5ca3242
parent 6038bbe5d2852ded39700e98499789a27e839e73
parent 3ef65d45d84538c804d9ba08baae1abf2def3dbb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591990307 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591990307 +0000

Merge "MediaMetrics: Prepare audio device usage protos for statsd am: a629bd13e9 am: 5999b5312e" into rvc-d1-dev-plus-aosp am: 3ef65d45d8

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

Change-Id: I546be512854a2835a831c31d77cbca33749d760b