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

Change-Id: Iec48a3ee2fcb203e1aa079e92c3641a3b1827269