Merge "Sysprop: wrap usage because of Floss" into main am: 8d5c31fb

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



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