Merge "Add Volume Control UUID" am: c50447ad57

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28c62a284b70c58b7f50de139788c1f5a4332106