[automerger skipped] Merge "OPP: Use identity address" into tm-qpr-dev am:...

[automerger skipped] Merge "OPP: Use identity address" into tm-qpr-dev am: 9eeecec1 -s ours am: a5b6715a -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: I31b243713ec3a0f4c73b67f15dc4475acabe4829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>