Merge "Wallet on lockscreen" into sc-dev am: c206854c9d

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

Change-Id: Ibcd3fd60d133c8d5ead0a8e2d29c6d377d4d3edf