Merge "Floss: Avoid non-empty battery result" into main am: 70176ae6

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



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