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

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

Change-Id: I91c83dbd43d5d1bcc4d2e7bd6faf3b3dfaa4c9cf