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