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

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

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