Merge changes from topics "nnapi-canonical-burst", "nnapi-updatable-drivers" am: 9b770726be

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb88d8cb5df9d0d8a276842f8fd101c922dc4b40