Merge "Prioritize non-slices over slices" into main am: d393732dba am: 98f2f90a82

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

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