[automerger skipped] OPP: Use identity address am: d03bb081 -s ours am: e5f3d7e9 -s ours

am skip reason: Merged-In I4769b33a5d0e5af9b60ff29006d062fcf6c51583 with SHA-1 dfdfeb13 is already in history

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



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