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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I003fdfdfd480a17f1d3549d25631dea8a91cd55c