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

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

Change-Id: I4fe6621b1ffb9dfb75ba7d744b627229ebd0259a