Merge "Fix errorprone issues - part 2" am: a853d52849

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I077bfa3e3802a4bde416b5be1414a0eb52b84308