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

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

Change-Id: Ide7796325285ca9f464604afdd86df428bc626e0