Merge "make btm_consolidate_cb static" into main am: 1b098168 am: eb64a799 am: 24e38321

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



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