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

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

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