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

Bug: 169893837
Merged-In: Ia7ca93a3390b2f59e894ca7ebce4cae9c0f83d28
Change-Id: I0e24283919d90a8cae59df3b2a43f6f240f25dfb