Merge "sysprop: Remove floss workaround from wrapper" into main am: 033f507d

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



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