Merge "Add support for Multiple enterprise slice" am: 0311ea0bc6 am: 59d67460af

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

Change-Id: I70081e2d4a11cdbb85b531f03cac9c895ced9f61