[automerger skipped] Merge "Use String8/16 c_str [graphics]" into main am: 382d1f84 am: cc4c5403 -s ours am: 51ffa553 -s ours

am skip reason: Merged-In I69aa06b109c2f40ecf40441cbbb0dfa3e1aa99a1 with SHA-1 f2add40f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2715993



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