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

Change-Id: Ife915a7d822a865da477979bb3ca290949843c69