[automerger skipped] Merge "Move the QrCodeGenerator from Settings to...

[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e0939b12 am: 2122ee9b -s ours

am skip reason: Merged-In I51151d71b89a92fe6880a00ead490adeb14f20bb with SHA-1 db1e3583 is already in history

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



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