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

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

Change-Id: Icff3acb7b47cc84518222e9f37b7515d6783cb73