[automerger skipped] Merge "Remove hidden connectivity methods reference in...

[automerger skipped] Merge "Remove hidden connectivity methods reference in ApnContextTest" am: b99c2868 am: 20e70549 am: 04c84f7f -s ours am: 3e1dc83a -s ours am: 2fb5f9a9 -s ours

am skip reason: Merged-In If804d524613d451a578ef0a06defd95054ce0aeb with SHA-1 4f739e06 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1683185

Change-Id: I66268bba73752fc87c0dd45d198b550b9971b5b8