Merge "Add flag...

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

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



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