Merge "Remove references to the pdk product variable" into main am: cc398bcfed am: 71ab5db6dd am: 272febabb6 am: 4dde38009a

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

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