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

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

Change-Id: I36726ea6a751af3fc85201a622d2ea649ac814d2