[automerger skipped] Merge "Use String8/16 c_str [audio]" into main am:...

[automerger skipped] Merge "Use String8/16 c_str [audio]" into main am: b904e85c am: 8a19026a am: 1d18a0e9 am: 20e9f69c am: c898f57d -s ours

am skip reason: Merged-In I54b54db81ae68ef2997162d8e5d913cb1522f773 with SHA-1 510002c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724076



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