[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 5d24e2e477 -s ours

am skip reason: Merged-In I2cdd175793d51e42886e0b1eb31528afb2093b25 with SHA-1 3ef522cf6c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/15546327

Change-Id: Iba99eef8c09741488036e32d124ae3180de81623