[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "aosp-nnapi-reusable-execution-canonical" am: 43ae2ecf am: 1d5c701a am: ce776a30 -s ours am: 75d290bd -s ours

am skip reason: Merged-In Iaac81668d247c2cb76d70e6abbd10f00b397b19f with SHA-1 ead6d37a is already in history

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

Change-Id: Id79a1c0508dfab46ef3db7b11dd2acc23cfbc945