Merge "Add Volume Control UUID" am: 8825584ab9 am: 159afd686f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie29ebf878b030e8c18c08ceb545ea8e1b4a3026f
tree: 2d8204cd1c0e03fb37618e3a7f5b14efc1683652
  1. framework/
  2. service/