Merge "Make firewall bpf code multi-user aware" into main am: 51741a1633 am: 8e9bf6bff2

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

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