[automerger skipped] Fix integer wrap sanitisation. am: 61e10c9c53 am: 5a3e448a22 am: d3f1c05623 am: aa22bcd1bc -s ours am: b8922879f6 -s ours am: 4ca54f6621 -s ours am: 7e939de3e9 -s ours

am skip reason: skipped by user mikemcternan

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

Change-Id: I171e88b1112c75c4ca06cae356e7b1d694a74573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>