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

Bug: 169893837
Merged-In: I35aae96e4ebb0c13bc567bb926f2e7a549f554ba
Change-Id: I5eb0e93b01f1bdc95df250f5cf94b597ccc1d42f