[automerger skipped] AIDL interface changes for NNAPI feature level 6. am: ef67442f46 -s ours

am skip reason: Merged-In Iabe45c57e2306d61055f711eda03b80b9cbe906d with SHA-1 a7adbcc630 is already in history

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

Change-Id: I0f1f3214aeadd42e5220ca4398c6f26ea211a4e2