am 80cb7300: (-s ours) am 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev

* commit '80cb73006d6c14f9a9cd506172d9223cbca8606f':
  DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)