Merge "btif_dm: Remove static enable_address_consolidate flag" am: 49c4f178...

Merge "btif_dm: Remove static enable_address_consolidate flag" am: 49c4f178 am: 98cdc3f9 am: d2a9a5d2

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



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