Merge "Add PACK operation to NNAPI feature level 6." am: 6e74ca65a7

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

Change-Id: If138128482f02242138cff3bdb847a13e8e22395