[automerger skipped] Merge "Move NN_TRY macro out of struct initialization" am: abb6060472 am: d8fb9bdad8 -s ours

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

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

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