[automerger skipped] Merge "Add com.google.android.btservices as...

[automerger skipped] Merge "Add com.google.android.btservices as mainline-module-package-name" am: 283c3e7b am: 3fadeb4b -s ours am: 236f9a8b -s ours

am skip reason: Merged-In I9dcacbb031456223937ffc118683706338d5330a with SHA-1 4293b48e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2321991



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