Merge "Apply aidl_format to NNAPI AIDL interface files" am: 06811c8124 am: 1ac13080b3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib02a55923e94f81940467800706854d587a1ec06