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

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

Change-Id: I4b7c23d7941515235b9343e254c53c84bc071481