Merge "Bluetooth: don't output dumpsys info twice" am: c77074300b
am: fde6c2a4af

Change-Id: I53c6c777cac8eb129ba1a4a08e81a496deb31c44