Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into...

Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f59 am: 6b5973c4 am: 6d17c92f

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

Change-Id: I325b306a11a543c9cfc6779da23fcbca6fd141ec