Merge "Add PACK operation to NNAPI feature level 6." am: 6e74ca65a7 am: 9fc0aae600 am: 6232d05bf5 am: 9e836f5709 am: 6ec84071f4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1835817

Change-Id: Iee6a6cd8605d27b769ad5c25037a161937cebbdb