[automerger skipped] Merge "[LeAudio] New QR code scanner UIs and modify local...

[automerger skipped] Merge "[LeAudio] New QR code scanner UIs and modify local API" am: 2d016874 am: f16bc62a -s ours am: ded33f60 -s ours am: e456b493 -s ours

am skip reason: Merged-In I6f654d808dbcb92c99eaad9507b6328a80a0d5f4 with SHA-1 3f1ee56b is already in history

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



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