Allow the SIM country code to supplement the SIM language

The SIM language preferences take priority - but they only store
a language (e.g. fr = French), not an exact locale
(e.g. fr_FR = French/France).
So, the SIM MCC is used as a supplement to provide an exact locale.

Bug: 22054390
Bug: 21942138

(cherry picked from commit 581ed0704ebaba7043b112d1e39acc7bf1c8d498)

Change-Id: I87a3c1dd12832ac73fdafefefbb3281ad1bc7321
1 file changed