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

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



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