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

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

Change-Id: Ie1006c4f00a08d37185f03442f96339d89642efa