Enable country code update during setup wizard am: 643cbacd03 am: b3301bba14

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/21560184

Change-Id: I281655b812dcea9026d5fae93ac714de2e52b300
Signed-off-by: Automerger Merge Worker <[email protected]>