Merge "Move NN_TRY macro out of struct initialization" into tm-dev am: 13300287b5 am: 54684cc9a1 am: ca97912e22

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

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