Merge "Add carrier config for Visited Country FQDN" am: 2bc805e26d am: 5b300d7b7a am: 4d96babec1 am: 013d54a09c

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

Change-Id: I07ac7f6b67f382bfc81bff65e9c957c8ebc424da