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

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

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