Add new carrier configs for RTT

Add new carrier config values for RTT that may differ based on which
operations each carrier supports. Resolve conflict between aosp and
master.

Bug: 117350231
Test: compiles
Change-Id: I0b74fb41f7f0c13116355f6cddba0327f98ac1d4