[conflict] Merge "Fix array-related errorprone warnings" am: a1eb8cf1 am:...

[conflict] Merge "Fix array-related errorprone warnings" am: a1eb8cf1 am: 44f85760 am: 91d6c5b5 am: 6a79ae25 am: 9b3a5fc0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016



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