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

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

Change-Id: Ibff0263286415ac523ab19c93d59c19bcd429749