Merge "Merge "Controls UI - Fix action on unlock" into rvc-dev am: 627b49ad...

Merge "Merge "Controls UI - Fix action on unlock" into rvc-dev am: 627b49ad am: dd08c114" into rvc-d1-dev-plus-aosp am: 3932974d

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

Change-Id: I3e4943727647b7e8d0435f07a3271b79e4fab5f9