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

Merge "Use String8/16 c_str [aosp-main-future]" into aosp-main-future am: 19bcc3a5 am: be1e4e8d am: 77d48e43

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



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