am b078d6ef: Merge change 22803 into eclair

Merge commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d' into eclair-plus-aosp

* commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d':
  Add uuids to adb shell dumpsys bluetooth