am a7a42d1b: am 57927d9b: am 8a0fd130: Merge "resolved conflicts for merge of 64a4858b to mnc-dev" into mnc-dev

* commit 'a7a42d1b552f5a794f55365fe042e75653a010f7':
  Dump bonded Bluetooth devices in dumpsys.