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

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

Change-Id: I5ef34ee973b105b1c3c3296940473d7b1fd38607