[automerger skipped] Merge "Opt out from edge-to-edge in OppTransferHistory" into main am: 40ceeb1a am: 97efa658 -s ours

am skip reason: Merged-In I52bd925b0ef8fe42633133d2005ad3a1b3ba871a with SHA-1 9979418f is already in history

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



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