Merge "Audio policy: fix failure to unmute strategy." into rvc-dev am: 6b72bc88 am: e9b0bf34 am: b53a2eb8 am: b56c9153

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

Change-Id: Ic39942437a570a455aca4499bbb7b0484a1872b1