Merge "Remove references to the pdk product variable" into main am: 355f04fd am: 0201a63f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2693386



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