Merge "Dialer: Fix FC due to StringIndexOutOfBoundsException of builder"