Merge "Test Entitlement when telephony is present" am: 93773f0aa0

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

Change-Id: Ib5734aca35f2aee00d63b5684f6dd06b1063ef26