Merge "Merge "Floss: Fix scanner obj path" am: 9b38eb17 am: 8fa9c2e7 am:...

Merge "Merge "Floss: Fix scanner obj path" am: 9b38eb17 am: 8fa9c2e7 am: 0e5297ea" into tm-d1-dev-plus-aosp am: b4cac40f am: ca85188f

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



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