Fix language settings for Canada.

Adjusts behaviour after commit 04787851cbd97. We pass in the language
from the SimRecords (from EF-PL, EF-LI) to the MccTable language
matching code. This fixes pathological cases like sim language
= "fr" for canada, where we return "fr-US" instead of "fr-CA".

♫♫
Well, blame Canada, blame Canada
It seems that everything's gone wrong
Since Canada came along
♫♫

bug: 22684963
Change-Id: Ib72dc4fbdf864897c194836219b8ffaf14fc2152
1 file changed