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

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

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



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