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

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

Change-Id: If7eb919fd9142cf6232f00f6c342e97c672873a9