Merge "Make RTT while roaming configurable" am: 5ed251d5f2 am: 3eddb944f3

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1558634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a586754529afeb005f7720298309102332fbca5