[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: dc9e8e50 -s ours am: 78993f1b -s ours am: ccc49b70 -s ours am: fced251b -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: I19a6194ab48eea85043177fc0eee86813e7b195f