Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7

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

Change-Id: I8c1f907ff8dca2660a6d32371f57dfe31167031e