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

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

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