Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a...

Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a am: 7a1efdb5 am: b2f83bcd

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



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