Merge "Lockscreen spacing to UX specs" into sc-dev am: e1ae3b743e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15049505

Change-Id: I8f933678620d12db0d62275ea237f80aa8610642