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

Bug: 169893837
Merged-In: I6970e4114a1efacc36e25871b77c5350496a0b2a
Change-Id: I996a73bdcf0574bb961115d80f0065a489fb2a6f