[automerger skipped] Merge "Set country code even when device is not registered on network" am: fc9bc10d69 am: ba7001c930
am: 79f5b2e78b  -s ours

Change-Id: Iac64c1ea835668ecbdcb936d9f2fb0b1c6f3d5b6