Merge "Revert "Revert "Lock down String8|16.string() usage""" into main am: 8c9c7d076f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2752223

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