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

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



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