Merge "Fix to return BLOCKED_REASON_NONE for system uids" into main am: 1e29da75e9 am: a54e42d063

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

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