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

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

Change-Id: If83c8c2759ea0e77534c03d990b618f1f4301879