tree 187137414cbaa101bd7fffd1ac03fcc26b7bdbcd
parent fca6e070c57ee731fcefe8331e4a739c4397477e
author David Duarte <licorne@google.com> 1696978102 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 1696978102 +0000

Remove divergences in soong files from AOSP main

Bug: 298680973
Test: mmm packages/modules/Bluetooth
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a94ef57ebc136a62cbf322a9f577fcb1caf93da7)
Merged-In: Iccb65bc4ede79b656b5b17d3596d99744c168861
Change-Id: Iccb65bc4ede79b656b5b17d3596d99744c168861