tree 177e2f7e73f9b3917bdc8220480e5e7cf5e6a033
parent 548db7ed522be27aa7bec3318af73e41d0b82c65
parent 3271616ce922e08fb0b1d597d7d9b4edfbf50dfb
author Winson Chung <winsonc@google.com> 1560534862 -0700
committer android-build-merger <android-build-merger@google.com> 1560534862 -0700

Merge "Always use the locked input consumer when showing activity over lockscreen" into ub-launcher3-qt-dev am: dfbb964dcc
am: 3271616ce9

Change-Id: Ia23148377374fcc2d655a7e4d0259e9db195dc50