Merge changes from topic "nnapi_aidl_interface" am: 9b2940dbce am: afe5f36b93

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc09ab49e821e5b819091ccaf91cc3a7c3644b5e