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

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

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