[automerger skipped] Merge "[TL01]Remove the usage of hidden connectivity API"...

[automerger skipped] Merge "[TL01]Remove the usage of hidden connectivity API" am: 9b3bd786 am: ac404a08 am: 6996159e -s ours am: 8a0b38fd -s ours

am skip reason: skip tag Change-Id I051ac2dce8f1e0f91ddf59bc8d10367e90dbfece with SHA-1 d0d95810 is already in history

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

Change-Id: Id5007e05ed60aa8715c377f75f86fc4eb282277e