Merge "DO NOT MERGE: Fix array casting bug" into rvc-dev am: e632c246fa am: 307795db5f

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

Change-Id: I56ad9fbaea33d92091bb8572bc24e53e0d8f5e9f