Merge \"Fix tone region(for US, CA and JP) recognition for dual SIM\" into nyc-mr1-dev
am: 0e84c15443  -s ours

Change-Id: I5cca371623e3806a783af15f1dc6db1d4381b901