am feafc202: am fe225e25: Merge change I70e1f7a6 into eclair

Merge commit 'feafc202bbfd768423326aeb0faafaee3f348bb6' into eclair-mr2-plus-aosp

* commit 'feafc202bbfd768423326aeb0faafaee3f348bb6':
  Fix the selection of locale from SIM mcc.