Merge "AIDL interface changes for NNAPI feature level 6." am: 5dc5f2633f am: f385f9d59a am: 6dcb9f9765

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

Change-Id: I66e5f9c30beef8ff2e5da4ad917e65b7e8bc588b