Follow error prone recommendation am: 04878bed am: 9ebe9315 am: 84233e56...

Follow error prone recommendation am: 04878bed am: 9ebe9315 am: 84233e56 am: 521e6d9d am: 54a39613

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



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