Merge "Merge "Add API in SettingsLib/BluetoothUtils to get the control Uri from Bluetooth metadata" into tm-dev am: 814f53c5 am: b5b4cf9a" into tm-d1-dev-plus-aosp am: 6048c995

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



Change-Id: I645fa90c6263c81c7b8bae3b61969bf419e4c321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>