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

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

Change-Id: I8192036fbcc6f42ee1b22098887c0078f66b2e00