[automerger skipped] Revert "Fixes incorrect array type comparison" am: 2c593f65 am: d9f52966 am: d35708e1 -s ours

am skip reason: Merged-In Idf3f78304904a50b4937720c997409f2d3a93837 with SHA-1 2c593f65 is already in history

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

Change-Id: I90d2204665498071089d6d614373d5d5ddfcbe38