Merge "Fix aidl_format errors for NNAPI AIDL." am: 80502796ab

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

Change-Id: I23035ad4000dda7bbae1fa836f8cd5c3cabed56b