Merge "disallow 32-bit *system* userspace on 6.2+" into main am: a51221f011 am: c6dd7c716f

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

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