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

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

Change-Id: I14738d24a8b141705e57384c9d826dce9e5a881b