[automerger skipped] Make RTT while roaming configurable am: f966f8c19a -s ours am: f2762a9aff -s ours

am skip reason: Change-Id I318e83b3f8b04ca45ce8696ce7aac6d08a4df9c3 with SHA-1 91736ccc6d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09b1e02b73eba6acc2e9104e3b7a2fd5658a3883