Merge "Stop calling non-covered method" into main am: 29b0829a am: eaf4ef99

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



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