Merge "Add new carrier configs for RTT" am: c6b2c9df68 am: bbaf7644b2
am: 3cdba1092b

Change-Id: I00307083adaf3c1b2b4866ab8c3db51f1dc24387