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

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

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