Merge "Revert "Lock down String8|16.string() usage"" into main am: c5365ad49e am: 54702b2040

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

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