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 am: 621cce69

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



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