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

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

Change-Id: Ie873efc0694687750d61820b4f4f594416951d7c