Merge "Use String8/16 c_str" into main am: 5af8505e4a am: 5accccc4c3 am: 83ab214b87 am: 093158d736

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

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