Merge "Controls Activity - Always close when keyguard becomes active" into...

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

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

Change-Id: Iaf1e233cc379e017155f8775e770acf5f3bf7b4d