Merge "Add enterpriseSpecifier" am: fbe500351e

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

Change-Id: I02f02ed83192d1530c4f95d55a6b6c0301289de8