[automerger skipped] Merge "[LE Audio] Set activity for result after scanning...

[automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 95413639 am: 00a7d078 am: aa7ec2d5 -s ours

am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497



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