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: Id62a5b49e8cde784befbdb108dd34b6d4cc33546