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

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

Change-Id: I57c26eb8d91b629bcbdaa7cbdca56582bff7e4ae