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

Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc -s ours am: 8f9e2a81 -s ours" into sc-qpr1-dev-plus-aosp am: 4d7b75f5 -s ours am: 9c6d926e -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: I6f4ad1ca961d48518dcc1840721d4f3ec216d969