Merge "Remove references to the pdk product variable" into main am: ca545707

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2693149



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