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

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

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