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

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

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