Merge "Update wallet button size for large screens, reduce keyguard bottom text margin" into sc-dev am: 9027059bb3 am: 972c2a996b

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

Change-Id: I1c3cde0d43c910b08e6df7bf8038b69dd9afe9c6