Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f90193 am: 0e37e30151 am: 7a35f4b4de

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0d0d57bc74aaf9590dcdd4aa76919da8ccb7d0