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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie361bbecc49a7aa7b3f4eba38da8ae84adcdf408