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

core/java/android/bluetooth/BluetoothUuid.java

@@ -167,6 +167,11 @@ public final class BluetoothUuid {
     /** @hide */
     @NonNull
     @SystemApi
+    public static final ParcelUuid VOLUME_CONTROL =
+            ParcelUuid.fromString("00001844-0000-1000-8000-00805F9B34FB");
+    /** @hide */
+    @NonNull
+    @SystemApi
     public static final ParcelUuid BASE_UUID =
             ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB");