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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie29ebf878b030e8c18c08ceb545ea8e1b4a3026f