Merge "Use String8/16 c_str (mainline modules)" into main am: cf3bb9e41e am: b7db9df90d

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

Change-Id: Ic37bd9de2b400d87d2d98316dfc29df64138e98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>