Merge "Fix arrayList init bug that caused failures" into udc-dev am: a1aa15a3

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



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