[automerger skipped] Merge "Clean hidden api - ArrayUtils.contains" am: b28f7132 am: 71fb6bf8 -s ours

am skip reason: Merged-In I05841f7efa251b921872cea4f886e0665498f6c8 with SHA-1 0fce066f is already in history

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

Change-Id: I216123e56a38b56abc83153ed6913cdfcfec0aad