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

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



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