Merge "Controls - Remove controls from lockscreen, use wallet" into sc-dev am: 422a19bb59 am: 0fdf3d885d

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

Change-Id: I3c3c9da1752ead8cb11aca2c4d837c7d17cf2981