[automerger skipped] String16::remove - avoid overflow am: 4048e499 am:...

[automerger skipped] String16::remove - avoid overflow am: 4048e499 am: 107f18cb am: 9be245c3 am: 64fb5012 am: 4e27b699 am: 26b81f59 am: 8367a666 am: bd6ac4c3 am: f106b045 -s ours

am skip reason: Change-Id Iad46d95d9848928ba81000090b2fe9aec1e5eaac with SHA-1 4048e499 is in history

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

Change-Id: I5effb83f5bf812a9f34fb91a00b18d1628d161df