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

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

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