[automerger skipped] Merge "Update active context config when the ACL is...

[automerger skipped] Merge "Update active context config when the ACL is disconnected" into tm-d1-dev am: b54d3ea3 -s ours am: 79bc45bb -s ours am: 97357116 -s ours

am skip reason: Merged-In I598e8270a928c9dee1d47603b3bf8a2a48e251fe with SHA-1 5dd80e98 is already in history

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



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