Merge "Use String8/16 c_str [backup]" into main am: 8092c2119e am: a85cf17105

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

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