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

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

Change-Id: Ide1debd4b36def91646addb8d1956717eb35d39d