Merge "Use String8/16 c_str [cmds]" into main am: 4d32277443 am: 0ef1588780 am: 63a4968f6a

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

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