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