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

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

Change-Id: I2ec109a371913c05993b68faae00712fb7714474