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

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

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