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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If400965e3260d8d310faee86e4edce4235130553