[automerger skipped] Merge "Non ABI changes to neuralnetworks HAL" am:...

[automerger skipped] Merge "Non ABI changes to neuralnetworks HAL" am: eff68753 am: 736a899c am: 1d5b0a09 -s ours am: 0fb5e3fc -s ours

am skip reason: Change-Id I67b3a38c087edf6ba3c295f5ac43ca02b8359f6a with SHA-1 87ff8d20 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7eb1c78e12f734979d1dc1e6d1168c62491c5d0b