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

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

Change-Id: I6817cbc45faabde688d59f4cd36260cea231a1c5