Merge "Add enterpriseSpecifier" am: fbe500351e am: 84f7382107

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

Change-Id: Icd03b763c3599284900c7825c24aae2a86cc35d7