Merge \\"Fix tone region(for US, CA and JP) recognition for dual SIM\\" into...
Merge \\"Fix tone region(for US, CA and JP) recognition for dual SIM\\" into nyc-mr1-dev am: 0e84c154 -s ours
am: 780ce292
Change-Id: I34cd625dd4cb4c1403464a86f30571e39d9fe36d