Merge "Remove references to the pdk product variable" into main am: 25c5b6d169 am: d58bda495c am: 66be10335d am: bddc519908 am: cd781aed0c

Original change: https://android-review.googlesource.com/c/platform/external/neven/+/2692947

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