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

Merge "Remove references to the pdk product variable" into main am: ca545707 am: 360703f4 am: 16bae38f

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



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