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

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

Change-Id: I18226c7bc7897eb31e8c5e8cef30f17528611645