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

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

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



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