Merge "Make NN canonical->HIDL adapter execute* methods synchronous" am: f955569c8a am: c7d8c19823 am: 277e31957b

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

Change-Id: Ic8e1f71731ef3f429ec363a0730c0baafdf751b0