Merge "Use String8/16 c_str [cmds]" into main am: 4d322774 am: 0ef15887...

Merge "Use String8/16 c_str [cmds]" into main am: 4d322774 am: 0ef15887 am: 63a4968f am: ea3671a2

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



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