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: Icb9f9a982812a198d35c7aa6069556694d7e82b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>