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

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

Change-Id: Ie20c1de420283738f0a816b441b11ed174586b32