[automerger skipped] Merge "[LE Unicast] Using the active device as main...

[automerger skipped] Merge "[LE Unicast] Using the active device as main device after grouping" am: edc13cc2 am: 00773dbb am: 7f5b3238 -s ours

am skip reason: Merged-In I00e5471b9315c896b8c16723ad37d66a922c27e4 with SHA-1 acad49d8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2138094



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