Merge changes from topic "b/214428241" into sc-v2-dev-plus-aosp

* changes:
  [automerge] VT: fixed an infinite loop of RR sending. 2p: 71940cfdb9
  VT: fixed an infinite loop of RR sending.