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

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

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