Merge "Fix aidl_format errors for NNAPI AIDL." am: 80502796ab am: f51390d3ac am: 420f448b11 am: d33e4bc9e8

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

Change-Id: I77230310ab21f33c275b7a02ce5eedf6eb1ed44b