Merge stage-aosp-sc-ts-dev before making it an upstream

Bug: 169893837
Merged-In: If0165fe89ba69659d9e451c0cf0cc28ca2c70616
Change-Id: I9c863956c0484b36dab349c106ce7a9d0b651eb8