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

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



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