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

Bug: 169893837
Merged-In: I38cc89bc7f81f8d6d6165a4b8f344c0660c10364
Change-Id: Idb4ffda9324693b6cce9b403905aa84b5ec4c87c