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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If400965e3260d8d310faee86e4edce4235130553
tree: 2c72b536186430fcc7a147adab2acc1c9f9c7559
  1. core/
  2. services/