Merge "[TL01]Remove the usage of hidden connectivity API" am: 9b3bd786df am: ac404a084d

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

Change-Id: I0ef5514447d9f005586ceb6ba003489a7d67cf4b