Merge changes from topic "nnapi_aidl_interface" am: 9b2940dbce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2ab8486901f54ea9f1e5336629480edf6865e29