[automerger skipped] Merge changes from topics "nnapi-canonical-burst",...

[automerger skipped] Merge changes from topics "nnapi-canonical-burst", "nnapi-updatable-drivers" am: 9b770726 am: 4ed32668 am: 0f8f618e -s ours

am skip reason: Change-Id Ie1fffdc89dc5bd325d3cd7806d2de632b8513cf9 with SHA-1 29710836 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I920f723da724e47ab31e6866171c5399d283715f