Merge "Allow carriers to configure RTT while roaming" am: 923d7d28 am: 36e819d9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43ecce89c03cb33969f489c082684d3c5c0e56a3