Merge "Remove references to the pdk product variable" into main am: e6ca015645 am: bcd1192abc am: e13f95ec26 am: dfa1dd31a6

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367

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