Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5 am: 9853e8a94e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170

Change-Id: I31b89ce8b8504388deab49d9af7410f8d64b78fd