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

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

Change-Id: I09b4d4e9f10805ca967af176f44eeccd63bc1656