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

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2693406



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