[automerger skipped] Create only one vendor variant depending on path am:...

[automerger skipped] Create only one vendor variant depending on path am: 85708802 am: b56865ee -s ours am: 067da491 -s ours am: d7e981c9 -s ours

am skip reason: Change-Id I4ebe1da8d887cd76722fa8ab5ae9305da09074d4 with SHA-1 af578ffa is in history

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

Change-Id: Ie1f2e4e66352aacd1236976f51df8bd82211e04a