[automerger skipped] Merge changes from topic "nnapi-aidl-burst" am: e24a7e57 am: 7f4c0a22 am: 143f1030 am: 66689d7e -s ours

am skip reason: skip tag Change-Id I1744005cbf750b70b42367b81a2fa6b8f24c1904 with SHA-1 8b7e8138 is already in history

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

Change-Id: I13420431c8cfef663bf9c1bb19bd810df31280d1