[automerger skipped] Merge "Add system property for concurrent encryption on LE and BR/EDR" into 24D1-dev am: 51e5802b04
-s ours
am skip reason: Merged-In I31f8bcb49359473d52474231b6e777c62109ae51 with SHA-1 7e0d85ec53
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/comet/+/27148517
Change-Id: I6d8e981b2756964dd7b1df38de13fc6a0ae04428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
8a09358432