Merge changes from topic "nnapi-aidl-burst" am: e24a7e57e2

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

Change-Id: Iee324e1209c70e255d336cf6823e505346bba960