Revert "port this change to aosp/ I3fb908c43f869e8816f6e46c6b271ef0bbd15be0"

This reverts commit c9993bc0.

Revert because another fix is available
https://android-review.googlesource.com/#/c/platform/packages/apps/Bluetooth/+/525056/

Bug: 67942165
Test: make
Change-Id: I5867345a70ddca32a6c82c57cfe495475b169acd