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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4c76e8f3138a503b973ed92d913de1f558d52a5