Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72

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

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