am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t...
am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev
* commit 'c02ddd6a':
Ensure that the SIM language doesn't override the user language on the encryption UI.