Merge "Add new carrier configs for RTT"
am: c6b2c9df68

Change-Id: I353d63a70d36cbac54ae0af826934409a6d67093