Merge "Replace ConnectivityManager hidden symbols on BT" am: 5cd5f14d6e am: b051bdf8ef am: 032980c342

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1605236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I259cae0ea903d48c2e8a7fe60f2066520f3cd22f