[automerger skipped] Merge "Fix BT Snoop log size issue" into tm-qpr-dev am:...

[automerger skipped] Merge "Fix BT Snoop log size issue" into tm-qpr-dev am: eab45bd0 -s ours am: dc638d35 -s ours

am skip reason: Merged-In I4b7bb84ec2f14aff60388b10eae24d8896f61f5b with SHA-1 bf2a0b20 is already in history

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



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