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

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



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