Merge "Use String8/16 c_str" into main am: 920fe9b0 am: affd3c30 am: dc0c9884

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705933



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