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: Ib4810dddb206ac0c4b901924462ee61b11cb832b