tree 381bd00445308b7118edbb5d2d19fa06a5e11bce
parent 2fb6ae9d0c534b575c33e203aad17048cd6eb3b9
parent 4934b6f89f24b7bb35125add4a205afc4a0ae225
author Winson Chung <winsonc@google.com> 1559759934 -0700
committer android-build-merger <android-build-merger@google.com> 1559759934 -0700

Merge "Use device locked input consumer when an activity is showing when locked" into ub-launcher3-qt-dev am: ff9fe09b3f
am: 4934b6f89f

Change-Id: I76721194f421843c6b9d2f124b59e1d56c37c1f0