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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14deb62e82c7629de5cb62c61bf043ada37ab95c