[automerger skipped] Improve the structure of NNAPI AIDL Memory am: dd53d04d...

[automerger skipped] Improve the structure of NNAPI AIDL Memory am: dd53d04d am: a0f169b2 am: 1b5af259 -s ours

am skip reason: skip tag Change-Id I32322df676b83597c9e95f13662c322a6a80accc with SHA-1 8c4f0fcf is already in history

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

Change-Id: I8b6c12c69d913484c45654e5cdbd800e37b96edb