String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0

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

Change-Id: I3ab9771d898eea0158acfd07fbe5a2f4b7dad883