Merge changes from topic "firewall_socket_destroy" am: 179d18b3ad am: 6558e27712

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

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