Merge "floss: fix build breakage" am: 7d9b2546 am: 9c2ecce1

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



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