Merge change 22803 into eclair

* changes:
  Add uuids to adb shell dumpsys bluetooth