Merge "Fix errorprone issues" am: 242fb942fb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d5a9a36547c7f49b0ba586c8bb7d3639bf8c4a5