Merge "Support 32 match types in UidOwnerValue rule" am: ad5b0d96ef

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

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