Merge changes from topic "firewall_socket_destroy" am: 179d18b3ad

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

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