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: 4e385c1b am: 1cda46b3" into rvc-qpr-dev-plus-aosp am: 7110ca23

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

Change-Id: I7e886b162a1f2671d29df43fc398bd5498fbac94