Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am:...

Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42 am: 0dfc94f6 am: 95d32d67 am: 7e7df0d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799



Change-Id: Ia19d60b61eeb6e8d1511f3ab22a8156eab43a58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>