Merge "product variables are consumed via soong injection" am: 2882dcb7 am:...

Merge "product variables are consumed via soong injection" am: 2882dcb7 am: 8e27992e am: 2e7b1d63

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

Change-Id: Ia3e0a3486cc08809ada7ea3636dd0cfb3905e0c6