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: 9302caf8 am: 35b80d9a

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



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