Merge "Add enterpriseSpecifier" am: fbe500351e

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

Change-Id: I3e62f238737526540c72f3f9f6ddb2bb43a8a3b2