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

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

Change-Id: I525fa44f1252e2714446b13cc11ffe9260fc0e2a