[automerger skipped] Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
am: bd8c589390
-s ours am: 95c15f1f0b
-s ours am: ad2bdc8fef
-s ours am: 99b85ef683
-s ours
am skip reason: Merged-In Ibc29f0e90af28e14a11164fa8940920745545c7e with SHA-1 bf99e37329
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: Ib74419430b66930630a0057080f36d8116782ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: