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

Bug: 169893837
Merged-In: I2a2d02a0d7e67ee9577857a210cb6157683e5598
Change-Id: I0c4b099b959d66900eebc2624c85e000a84e9c54