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: 64d1cc6a am: 5ba8511f am: a310e723

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



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