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

[automerger skipped] system/bta/jv: Conflict resolution for libbluetooth_log migration am: a97ce1db -s ours am: 6f6a5589 -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: I35867c022f297f8f7c080fd9774960a412f3113f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>