Merge "Crash when scanning WiFi QR code" am: 6c31283455
am: 7950a0acaf
am: 7ada247bac
am: 64e4a57fa3
am: 7654e1fc4c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675 Change-Id: If1b4d5be4936a6b91656d5b2380f50ab6d757700
This commit is contained in: