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

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

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