Merge "Fix CTS CallComposerTest failure when HSUM is on" into main