Merge changes from topic "nnapi-canonical-ahwb" am: 8548f574ee am: ece0b71cc1 am: ae714190a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b491b80f1f1c5f3a34b5a54b565c7dd2e7ebe68