tree e12c87d8ac5d1cab8879bc577b290e6366995c71
parent c37aa9704694b5f2a64c5842e0daf7301b53ecd0
parent 6ea42dcf9f6d3c4f53d75ec2987ed35e7bfdd1de
author TreeHugger Robot <treehugger-gerrit@google.com> 1631809506 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631809506 +0000

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: Id43674096305ee38078c35f5334d8586daa34e29