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

Bug: 169893837
Merged-In: I77d92d95f0db738059c515f0699e154c7cb19e33
Change-Id: Ibe0016c567937c0c912b7b147ca28522fef9a64a