[automerger skipped] Merge "AIDL interface changes for NNAPI feature level 6."...

[automerger skipped] Merge "AIDL interface changes for NNAPI feature level 6." am: 5dc5f263 am: f385f9d5 am: 6dcb9f97 am: 3435a62a am: 3ab31ee5 -s ours

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

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

Change-Id: I96547671be969431e54885225492a63a68909604