[automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
am: 00a7d0788f
am: aa7ec2d5fe
-s ours am: 8170de078c
-s ours
am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d16
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: I25ba7dbd89cf9c9d81993fa6fb1ae8117b520737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: