[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on...

[automerger skipped] Merge "Replace ConnectivityManager hidden symbols on Telephony" am: 45afd727 am: 83c4da5b am: e98c0a5d -s ours am: b0532397 -s ours

am skip reason: Change-Id I0a7dccbea1295cbb665106ee9a2a8705ee2c7ba7 with SHA-1 a36fc56e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70afff7096bfcd054e29e0953199b12edc9749fc