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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8101d1141a769cb54650f3944181f6835b3838fd