[automerger skipped] AIDL interface changes for NNAPI feature level 6. am: b0cf0db3b0 -s ours am: 7890f1f9db -s ours am: 41d1bde448 -s ours am: f56af942f0 -s ours am: f3f8325d0b -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: I057be1bd2afaa3a77b02f22b9211c245cfe376e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>