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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47778548f6de46c094f680864c8ff02002344e8a