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

Bug: 169893837
Merged-In: Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578
Change-Id: I7359c0b3fb5ad0fddbbd2a2464d8a6fd8bb73348