Merge "Support adding suffixes to module names and deps." into main am: 6c90665cee

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

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