[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 0f76d3b8 -s ours

am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547733

Change-Id: I1e35c7db0a73cec7993824ac7d53a513fd6812d1