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

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

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