Merge "Fix array-related errorprone warnings" am: d38b13f5 am: f1b1d348...

Merge "Fix array-related errorprone warnings" am: d38b13f5 am: f1b1d348 am: 6d989edb am: 22aa38e6

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



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