Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792...

Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792 am: 129e80c7 am: 317ca924 am: cbb127a4

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



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