Merge "Break constant information out of product vars" am: 12f9cef5 am: 70c385ac

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



Change-Id: Ifce5dcd813f712511fed364e230be45bcb99ba3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>