[automerger skipped] Merge "Standardize RTT behavior across carriers" am: 7f4ae65fce am: cfa22f20fd
am: 77ceb82a6e -s ours
am skip reason: change_id I6e39c9cb9f2fc70cf67afb6ffbf369f66d4449e0 with SHA1 30de35085f is in history

Change-Id: I6bde64d3a3984de9b508041b459d6c53f6bfa48e