[automerger skipped] Merge "Move NN_TRY macro out of struct initialization"...

[automerger skipped] Merge "Move NN_TRY macro out of struct initialization" am: abb60604 am: d8fb9bda -s ours am: 25b44c92 -s ours

am skip reason: Merged-In I3493fd4764f8eacc86750e6414e62bc891abaccd with SHA-1 7ecc2907 is already in history

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



Change-Id: Iee956c62230ce7585e93d85c200bb51e0ac068c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>