Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f90193

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83a8eb6c8cefd7f84448ad14acd97e6582a4d1e4