[automerger skipped] Cleanup NN callback error handling am: 7fd03c265e am: fba38351e5 am: dc4b50c2e1 -s ours

am skip reason: Change-Id I62714a932e71dfc77401bbcb9eaaaf3d94fb9707 with SHA-1 98ed9baf5d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a574775cecb5ce0c32a7b40fad3bba1d161ee2d