Merge "Convert variant suffix to module_name_overrides." into main am: 514b3f190e

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

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