Merge "Add flag enforce_resolve_system_service_behavior" into main am: 47d32b91 am: fa01219d

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



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