Merge changes from topic "nnapi-aidl-memory" am: 6594b5f1b4

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

Change-Id: Ib56dbbc032236ffe012f36dfb83040b06847f455