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

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

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