Merge "Merge "Audio policy: fix failure to unmute strategy." into rvc-dev am: 6b72bc88 am: c77f6742" into rvc-d1-dev-plus-aosp am: c90a9391

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

Change-Id: Ib27a78821e72a3380df401b16f678890dbabfad0