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

Bug: 169893837
Merged-In: I333fd284a2e0d7abf1088ac170f6d02e304615a5
Change-Id: I1e0bbf9d4f44cb09fde0f6072d2440974ba64cc8