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: I0df5ed172ea00f2d2bf44e8f37c1b417fc9245b7