Merge "Add flag...

Merge "Add flag opp_service_fix_index_out_of_bounds_exception_in_update_thread" into main am: 8ea67885

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



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