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

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

Change-Id: I21d741496123156b31e9aa437f58de779fad07e5