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: I7fcfd55573d121122867893a5624c297a1f18653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>