am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev

* commit '3585062760990b8ec3148b266155ae9ec033934d':
  BluetoothControllerImpl: track bluetooth better