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

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

Change-Id: If5236959716beeb70e91c4831949325e8a53d099