tree abca69dd86f95dda74c51fd3fd4f137363c2b050
parent 18406a2a2efa722972f10a0bd2d4d94df17dbb62
parent aabbf71566bb11977ec7966365aec6e2aa141175
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592609087 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592609087 +0000

Merge "Merge "MediaMetrics: Retain previous audio state a limited time." into rvc-dev am: f3f98cc259 am: ebf2ce16a7 am: bcd8b92a80" into rvc-qpr-dev-plus-aosp am: aabbf71566

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

Change-Id: Ia2f83441cc64a4e522b9e8086c420f4e162ba127