Merge "Remove references to the pdk product variable" into main am: 0950447d...

Merge "Remove references to the pdk product variable" into main am: 0950447d am: ecc86c1f am: 7d7e5b74 am: d2bf2451 am: ab1bdda5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692949



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