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

Merge "Remove references to the pdk product variable" into main am: 150c815e am: 9912352a am: f920d698 am: d631ddc6

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



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