Merge "Use product variables from the overridden apex" am: ae3e4cc2fd am: 21b35cc1f6

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

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