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

am skip reason: Merged-In Iadbaf4fa9574878f64094ff1212ab14584b90518 with SHA-1 d8fb78b336 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ltp/+/15547732

Change-Id: Ib02a4e021d2b62ccd7429dded655811a0b92a6f4