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

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

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

Change-Id: Idc499edb4cd245a9cfa4432e8ceeb71f07c49249