Merge "Diff array types" am: 9b286a1967 am: e380c2f9cc

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

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