[automerger skipped] Merge "Make the names of 'soong_config_module_type_import' modules unique." into rvc-dev am: a6ffd8b1 -s ours
am skip reason: Change-Id I6782e42c129dc3b0fc7649ce97d5f94effc63fa7 with SHA-1 116ec92e is in history
Change-Id: Ic145ae203ad235a6c4c068505dc73af9d9c58355