Merge "Replace ConnectivityManager hidden symbols on framework" am: 1984fb1cb0 am: 27612f4a2d am: f0ff9b845c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0d0d57bc74aaf9590dcdd4aa76919da8ccb7d0
tree: bffc5c444f0479083875af1f16901e06383d8b2b
  1. core/
  2. services/