Merge "Bug fix for wallet screen and lockscreen icon." into sc-dev am: 2e14d6d5

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

Change-Id: I3a752583607a71a736b7eb50c4216dfc63a59c68