Merge "Move NN_TRY macro out of struct initialization" into tm-dev am: 13300287b5 am: 12adc10cfd

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

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