Merge changes from topic "binder-array" am: 358e55fe92 am: 9634705afb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1856220

Change-Id: I545789466f966fcbfda07217e12a4ff865cd5246