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

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

Change-Id: I9da4cc4896c5a96c115b3ad9dcd8a2003881d2a3