Merge "Revert "Prioritize non-slices over slices"" into main am: 11162e97c6

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

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