[automerger skipped] Merge "Allow carriers to configure RTT while roaming"...

[automerger skipped] Merge "Allow carriers to configure RTT while roaming" into rvc-qpr-dev am: ea6f6c85 -s ours am: 9ea95064 -s ours

am skip reason: Change-Id Ied2418cdec57d2d405d4ed0f0227a251ecd626cf with SHA-1 d20b2a01 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70bfd489ac62770c5a23db0bd2c26b05ad1375f1