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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f2f13629bc27fd90a58a2eb5a2240b464fb2b46