[automerger skipped] Merge "Fixed that country code was not updated when...
[automerger skipped] Merge "Fixed that country code was not updated when airplane mode is on" am: f73ce141
am: b0dbaac7 -s ours
Change-Id: I01bcdb359eb3323f7c091d17179f63e2ef20811f