Merge "make btm_consolidate_cb static" into main am: 1b098168 am: 1806dedc am: 9176fe77

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



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