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

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



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