Merge "Use String8/16 c_str [surfaceflinger]" into udc-dev-plus-aosp am: a988dbd6 am: b98621fb

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



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