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

Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/2693208

Change-Id: If1846f9b182229a03b02b9997ed1dc6ef900c5d0
Signed-off-by: Automerger Merge Worker <[email protected]>