Merge commit '768c6e835c73b56ce5d10e5f81bfbe4990922d13' * commit '768c6e835c73b56ce5d10e5f81bfbe4990922d13': Add uuids to adb shell dumpsys bluetooth