[automerger skipped] Merge "Test Entitlement when telephony is present" into sc-dev am: 8d75184baf -s ours am: 548002b286 -s ours

am skip reason: Merged-In I9fbb7141691fbbf8685b46359c050e0385928805 with SHA-1 e0e656c9b3 is already in history

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

Change-Id: Ieaca92c3f3a82dd32b4badedb94b47ec493707de