Merge "[LE Audio] To fix the QR Code parse error" am: 114052e5a4 am: a837beb173

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

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