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

[automerger skipped] Organize product vars for adding properties am: 1ea01c5b am: 5c418f56 am: a06f8ba8 -s ours

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

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

Change-Id: If9b17b31a3b2224fa778e4d90eb2219011678e11