[automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in...

[automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d59 am: bd8c5893 -s ours am: 95c15f1f -s ours am: ad2bdc8f -s ours

am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e373 is already in history

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



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