[automerger skipped] Merge changes from topic "nnapi-aidl-memory" am:...

[automerger skipped] Merge changes from topic "nnapi-aidl-memory" am: 6594b5f1 am: d6a1875b am: 099b2a57 -s ours

am skip reason: skip tag Change-Id Ief565473b4d82e0bb43785fc3b8275b16bd26cf6 with SHA-1 bed23d9c is already in history

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

Change-Id: I6fc85a329134106034193653249f505ac3411d74