[automerger skipped] Merge "Fix OPP comparison" into tm-dev am: d9948659 am: 71a59161 -s ours am: ab68d9d2 -s ours am: 9bf11135 -s ours

am skip reason: Merged-In I61118f22577de7b975fb0df8dac8583e91f7b8c7 with SHA-1 8c312386 is already in history

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



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