[automerger skipped] Merge "Use String8/16 c_str [tools]" into main am:...

[automerger skipped] Merge "Use String8/16 c_str [tools]" into main am: e1ee1aab am: 5da3bffd -s ours am: ab2f3f48 -s ours am: 68adfb47 -s ours

am skip reason: Merged-In I82d6899d8c15a10b15399c39177290012bb5f13b with SHA-1 ade06319 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2715262



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