Merge "Convert name_suffix." into main am: 7632db5b29

Original change: https://android-review.googlesource.com/c/platform/development/+/2824520

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