[automerger skipped] Merge changes from topic "nnapi-canonical-ahwb" am:...

[automerger skipped] Merge changes from topic "nnapi-canonical-ahwb" am: 8548f574 am: ece0b71c am: ae714190 am: 98de57e3 -s ours

am skip reason: Change-Id I394071c193d15ac0c90ac47e5a2a9a79c635db6c with SHA-1 bbe43d95 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51c8cceda249030f75060899b9f7efefbba81274