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

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

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



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