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

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

Change-Id: Ic6890112b86618445e7335933ceebfdc9e887e40