Merge "Fix race condition in HIDL radio serivce test" into main