[automerger skipped] Merge "leaudio: Fix for removing data path" into...

[automerger skipped] Merge "leaudio: Fix for removing data path" into tm-qpr-dev am: e55d52bf -s ours am: d8aeb580 -s ours

am skip reason: Merged-In I8486c15472ff886fa3e9156bbf2ad80b67251875 with SHA-1 b6523f3a is already in history

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



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