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

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

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

Change-Id: I2e9fde9fac6ce809446218fef8a809176d2be244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>