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

* commit 'b394253a3f86df065783d5c07250c155428702e5':
  BluetoothControllerImpl: track bluetooth better