[automerger skipped] Merge "Fix regression on voice call default volume" into...

[automerger skipped] Merge "Fix regression on voice call default volume" into rvc-dev am: 962946c9 am: 86c25ccf am: f30bf87c am: 7ec84bf2 -s ours am: 7431d689 -s ours

am skip reason: Change-Id I8937e54a61df196da8c2578f0a581b63dea34caa with SHA-1 75702566 is in history

Change-Id: I549efc949158f89065d176a393511e55e36a1fc2