Merge "Add support for Multiple enterprise slice" am: 0311ea0bc6 am: 36598b6e18 am: 18f5317a60

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

Change-Id: I41272014c04cdf234b5fef755222b840c70c4bd3