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

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

Change-Id: Ia9b5fe238b560dfed2c9af7b33fd5eb4636cb997
Signed-off-by: Automerger Merge Worker <[email protected]>