Merge changes from topic "revert-2446033-revert-2319094-bssl_jan2023-OYGIWALFXH-ATZFEIGQDA" am: edb8d644fb

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/openssl/+/2470949

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