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

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

Change-Id: I7635daa0df647ee77a54e1dfafc319e500a9d98e