Merge "Remove a use of String16::remove." am: 7f48273b74 am: 2b1fe316ea

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1704488

Change-Id: I5b20c7a3381fe63964c954b6afde2a9c5385cf4e