[automerger skipped] Merge changes from topic "aosp-nnapi-burst-compat-lib"...

[automerger skipped] Merge changes from topic "aosp-nnapi-burst-compat-lib" am: 593f0eca am: 226d3a68 am: 01d802c7 am: 9f799711 -s ours

am skip reason: skip tag Change-Id I5018f6cf2dbaf705f74f4f46318142c64433e19d with SHA-1 acff4063 is already in history

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

Change-Id: I60104da6ee39e409bd518e70af907dec11b3f63e