Merge "Remove references to the pdk product variable" into main am: 25c5b6d169

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

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