Merge "Fixing array cast." am: caa4617084

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

Change-Id: Ic7f4670ae3f1d54f436f7e67933ddd769d0075b2