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

[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc -s ours am: 32ca6e81 -s ours am: 18ef1755 -s ours am: 05605994 -s ours

am skip reason: Merged-In I2a2d02a0d7e67ee9577857a210cb6157683e5598 with SHA-1 52846cd8 is already in history

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

Change-Id: Ifc0f2ae535ad39600fdc88624815fa863b1ea593