tree 3c04aa8ba1c3766ce8489624d975ce32842c4576
parent 739f8a3fb192107ea194e8ce4bf9529f575c34e0
parent 1297f9019349fbf48736c333393b1a169026562f
author Paul Hu <paulhu@google.com> 1614827505 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614827505 +0000

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