Merge "Remove references to the pdk product variable" into main am: ce002f9153 am: 96bb6f89ed

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2693009

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