Merge "Don't depend on String8 cast to C string" into main am: 24636e4e30 am: ed26eba982

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748674

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