Merge "Use String8/16 c_str [surfaceflinger]" into aosp-main-future am: 8efc78d4

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



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