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