[automerger skipped] AIDL interface changes for NNAPI feature level 6. am:...

[automerger skipped] AIDL interface changes for NNAPI feature level 6. am: b0cf0db3 -s ours am: 7890f1f9 -s ours am: 41d1bde4 -s ours am: f56af942 -s ours am: f3f8325d -s ours am: 804b3efe -s ours

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

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



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