Merge "Merge "Ensure btm_log_history is constructed" am: acc4f792 am:...

Merge "Merge "Ensure btm_log_history is constructed" am: acc4f792 am: 51fe97fd am: 174fa642 am: 5d8760c0 am: e55ad2ed" into tm-dev am: 72bfb4f0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18110098



Change-Id: I59e06c015c1cf9ddd21b019ed07eecac18a11054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>