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

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

Change-Id: I64622eaa6e2d0c880c6818345a7695d6f4762675