Merge "audio policy: fix wrong ring volume after music stops." into sc-dev am: fddb5604a3

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

Change-Id: I887a68dda3aff0dbe26638bec47fa60299b3a4d1