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

Bug: 169893837
Merged-In: I14e544285d4096c404e33b79bc877836210523db
Change-Id: I1bd9fd64e9b123f70f49b6269ce28a63b99cf6e1