Merge "Add flag opp_ignore_content_observer_after_service_stop" into main am:...

Merge "Add flag opp_ignore_content_observer_after_service_stop" into main am: dd1b19be am: 108a5a44

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



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