Merge changes from topic "fix-volume-slider-during-phone-call" into tm-qpr-dev...

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

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



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