Merge "[Invisalign2] Clean up headers in btm_ble_batchscan.cc" into main am:...

Merge "[Invisalign2] Clean up headers in btm_ble_batchscan.cc" into main am: 2f402649 am: 9000879e

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



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