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

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

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