am 768c6e83: am b078d6ef: Merge change 22803 into eclair

Merge commit '768c6e835c73b56ce5d10e5f81bfbe4990922d13'

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