Merge "Merge "Fixes incorrect array type comparison" into sc-dev am: 4fd129b5 am: 064c78d9" into sc-v2-dev-plus-aosp am: ddc5b4b3

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

Change-Id: Ifc3131ddf57f3880382db568ac49ac0c85b7dc80