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

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

Change-Id: I1a0d1b62dca7b5f1907d3c8d0f57bada502a0930