Merge "Always play remote hold tone if carrier config indicates it should be."...
Merge "Always play remote hold tone if carrier config indicates it should be." am: 02267f80 am: 2871a504
am: a2a9d3e1
Change-Id: I38242e04bbe21f04c042facd78054e460c99510e