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

Bug: 169893837
Merged-In: Ic505114a3751dfeeeaf7235b24e75e64e4b544cc
Change-Id: Id7f85f9d145900a1c30f20c3370ec8bc04d3d8f6