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

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

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