Merge "Merge "replace char * with std::string" into rvc-dev am: 56c303b7 am:...

Merge "Merge "replace char * with std::string" into rvc-dev am: 56c303b7 am: 714f5f68 am: 4edb8995" into rvc-qpr-dev-plus-aosp am: 8e987d6b

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

Change-Id: I173d3819d5b1e441c16528c92fe5524dbe7aa49a