tree 3058906daf2207a477095fcf1a9bae6393e4f72a
parent 6e3f68aa489171363b5c240cb38c3b2dd475768d
parent e40a4b04beabffa68cfb39da5ca08c78457562c3
author Xin Li <delphij@google.com> 1595356319 -0700
committer Xin Li <delphij@google.com> 1595363526 +0000

Merge stage-aosp-rvc-ts-dev into rvc-dev

Bug: 148878042
Merged-In: I7fe1545a4255ad3a476cb60b702a02b666a9954e
Change-Id: Ia3d51e6653b8914aa90cc2b68e28c6bddc76ce77