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

Bug: 169893837
Merged-In: I1822f5e4bce222f21c2d9ae02c3d4f8ed70f621a
Change-Id: I158dece063712ce94ff1a3cd6b20abe37d5c1db7