Merge "Fixing array cast." am: caa4617084 am: 4737ee5fa4

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

Change-Id: I8db0d4b1bbc8a0932bbe1a6221bef3b8e845b2dc