Merge "Use String8/16 c_str [surfaceflinger]" into aosp-main-future am: 8efc78d40a am: 91db541e9c am: 11482ebe36 am: 8fcbd5e02d

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

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