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