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

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

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

Change-Id: Ied4a661098018ae1d8c85b89375547725b24a57b