Merge "Remove pdk product variable" into main am: 18244633 am: f2d88a1a...

Merge "Remove pdk product variable" into main am: 18244633 am: f2d88a1a am: 98746a4f am: 478abea1

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



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