[automerger skipped] Merge "Remove divergences in soong files from AOSP main"...

[automerger skipped] Merge "Remove divergences in soong files from AOSP main" into main am: e02532f0 -s ours

am skip reason: Merged-In Iccb65bc4ede79b656b5b17d3596d99744c168861 with SHA-1 a94ef57e is already in history

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



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