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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8362b96aa67e65411799162ea01bf934f8c23dec