Merge "Remove non-UTF8 characters from string fields." into main am: d7f95d9e69

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

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