Merge "Always play remote hold tone if carrier config indicates it should be."