[automerger skipped] Merge "Don't call onStartRtt unless RTT property changes" am: 7ae46ae892
am: 57e3c07855  -s ours

Change-Id: Id2ae2cf9d6823ea89200b7bec632eb9129eb1122