Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada am: a42efdda60

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30ba05c835a01d0edf0ec7e9e3fbc75fccd12e92