Merge "Diff array types" am: 9b286a1967

Original change: https://android-review.googlesource.com/c/platform/development/+/2385933

Change-Id: I1227595d9835dcc1ce5420bc19a5d7e674a18926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>