Merge "Remove String16::remove." am: e9c7c5c80c

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

Change-Id: I52be9e6ce3fbdefca14317ad12ea3e536e73c704