Merge "Controls Activity - Always close when keyguard becomes active" into sc-qpr1-dev am: 6ea42dcf am: 4e1c9e63

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

Change-Id: I8de9c41064759d4d4cf1b8c676b60743e2c96ea4