[automerger skipped] Merge "Organize product vars for adding properties" am:...

[automerger skipped] Merge "Organize product vars for adding properties" am: cd0c931b am: 2e906be2 -s ours am: bd8b0a4b -s ours am: b39da2d7 -s ours

am skip reason: Change-Id I98f3b5d0da661b3ad75260a23754e655103b7a44 with SHA-1 1ea01c5b is in history

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

Change-Id: Id93d69c9ce368da966e207188ed9114f8f6c76b2