[automerger skipped] Refine logic choosing vendor snapshot modules am:...

[automerger skipped] Refine logic choosing vendor snapshot modules am: 7f283f4b am: 8aa5b390 -s ours am: fda5a676 -s ours

am skip reason: Change-Id Id90082b5ab730f928582ad24f022ba410855400e with SHA-1 4d8d8fec is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324100

Change-Id: Ic800aaf3a04c86c9bf840d78b55ae487088f9555