Merge changes from topic "fix-volume-slider-during-phone-call" into tm-qpr-dev am: 270620a6

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



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