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

[automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d34 am: e300781f -s ours am: 34c513f0 -s ours am: d1e22801 -s ours

am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fa is already in history

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



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