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

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

Change-Id: I938301132dbf2267058c191e24c8a3353413726a