Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2 am: 6b6e4386 am: 60fa2c0f

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

Change-Id: Icc51148d549fa2fb9174f4ab559dba2898efc1ab