[automerger skipped] Merge "system/bta/jv: Conflict resolution for...

[automerger skipped] Merge "system/bta/jv: Conflict resolution for libbluetooth_log migration" into main am: 782e770b -s ours am: 125ddb81 -s ours

am skip reason: Merged-In Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4 with SHA-1 3cc60340 is already in history

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



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