Merge "Add tests for comparator in AIDL bcradio HAL utils" into main