Merge "bpf: change NetBpfLoad rc file from 33 (T/U) to 31 (S/Sv2/T/U)" into main am: 6211aefeb7

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

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