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

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



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