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

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

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