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

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

Change-Id: Icaeeab05ee6a704f7ef8e618614a63e64f796e56