[automerger skipped] Merge "Fix OPP comparison" into stage-aosp-master am:...

[automerger skipped] Merge "Fix OPP comparison" into stage-aosp-master am: 285b14d9 -s ours am: 83ee2637 -s ours

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

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



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