Merge "Use String8/16 c_str [backup]" into main am: 8092c211 am: a85cf171...

Merge "Use String8/16 c_str [backup]" into main am: 8092c211 am: a85cf171 am: 50c93d48 am: 41026a38

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



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