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

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



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