Merge "Add enterpriseSpecifier" am: fbe500351e am: 35dfb16fbb am: 59c87b9ebc

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

Change-Id: I19d331f43177955bba7c1b3d1a43f81dd3b750fc