Merge "Fix errorprone warnings that should be errors" am: 2a252911 am: 38d6789f am: 7855e9c5

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



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