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

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



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