Merge "Follow error prone recommendation" am: 3bea7365 am: 1055e7b2 am:...

Merge "Follow error prone recommendation" am: 3bea7365 am: 1055e7b2 am: ff45d8b3 am: cd663b4f

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



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