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: 10e5657a am: 50911db0 am: a3714708

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



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