[automerger skipped] Merge "Set country code even when device is not registered on network" am: 0afecea735 am: bfa6b55719
am: 0ea717f41c  -s ours

Change-Id: I077063b5ac8fee96c45568289adee018de8f2823