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

Bug: 169893837
Merged-In: I2cdd175793d51e42886e0b1eb31528afb2093b25
Change-Id: I71fcb10a4411167a30ae344c96a43c0c2a6ee6cb