Merge "Update wallet button size for large screens, reduce keyguard bottom text margin" into sc-dev am: 9027059b am: d9c25573 am: b9861f64

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

Change-Id: I2225a3bfb23a1709a83061357de80079a3c871a8