[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an...

[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c -s ours am: 78e68f78 -s ours am: 15126b82 -s ours am: ff808cd6 -s ours

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

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

Change-Id: Ie8bc18991cfc9191b10c21a4be8b104f38d41ac7