Merge "Add carrier config for Visited Country FQDN" am: 2bc805e26d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943513

Change-Id: I24ff0ee55f7b704df3cf7b409ba2fe668b5c1e79