Merge "Use LazyLock rather than lazy_static macro." into main am: 3dad5f754d am: 233476e5a3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3251460

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