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

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

Change-Id: If8fa89c9dd4a726d3599a486eb78649da24acd7c