Merge "Improve code style for HIDL bcradio service" into main