Merge "Standardize RTT behavior across carriers" am: 7f4ae65fce
am: cfa22f20fd

Change-Id: Ia9cf5e78535e07f775811f5fc822a7f074588302