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

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



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