Merge "Merge "Add volume control id to MediaSessionRecord.dump" into udc-dev...

Merge "Merge "Add volume control id to MediaSessionRecord.dump" into udc-dev am: 4604f651 am: 4daacec8 am: 65cf1ee5" into udc-qpr-dev-plus-aosp am: b26b0c8d

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



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