[automerger skipped] Fix volume controls show media instead of call volume during a call. am: 188ab32778 am: d806bf8985 -s ours
am skip reason: Merged-In Iabac3c80631fd429daba23454488fceedbcc584d with SHA-1 ed9f9d1b0a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610510
Change-Id: I8e937b5cf35ba438d40fdcb1b32cea70da3fccfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: