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

[automerger skipped] system/bta/jv: Conflict resolution for libbluetooth_log migration am: 3cc60340 -s ours

am skip reason: Merged-In Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4 with SHA-1 87d1a999 is already in history

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



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