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

Change-Id: Icdaa952d20034f9295c96023677d29f953594a98