[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 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: I788022a55e9fd25965679c1187e9bb6138f9a80a