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: dc9e8e50 -s ours am: 932a99bb -s ours" into sc-qpr1-dev-plus-aosp am: 190df1d4 -s ours

am skip reason: Merged-In I3735e0752a6e502536000bd3102abda30cbd58fe with SHA-1 84b43537 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15547707

Change-Id: I2164682abea8584da5caec8dc71f6ceb551b7c43