[automerger skipped] Merge "Add system property for concurrent encryption on LE and BR/EDR" into 24D1-dev am: a9d20b849f -s ours

am skip reason: Merged-In Idd154d27dedbb15262a4ce4d478fedaa6748b40f with SHA-1 ca94ed1a3d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/27152177

Change-Id: I3f1688e6186cec4644f1d9a4cd80537c9672822f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-05-07 03:09:09 +00:00 committed by Automerger Merge Worker
commit 3c49acaf74

Diff content is not available