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

Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2 am: 45a56735 am: d098a72c

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

Change-Id: I408167f007368d940dcf99e00ab547fa7237e5db