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

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

Change-Id: I34e27163ec47ca182ed4a16673f0923bd2c13feb