Merge "Add volume control id to MediaSessionRecord.dump" into udc-dev am: 4604f651 am: 4daacec8

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



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