[automerger skipped] Fix volume controls show media instead of call volume...

[automerger skipped] Fix volume controls show media instead of call volume during a call. am: 188ab327 am: d806bf89 -s ours am: c3bfc884 -s ours

am skip reason: Merged-In Iabac3c80631fd429daba23454488fceedbcc584d with SHA-1 ed9f9d1b is already in history

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



Change-Id: I430e52834233017e30c943c54cd6026f13627e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>