Merge "App discovery integration in All Apps search" into ub-launcher3-dorval
am: 86515dd148

Change-Id: I9c912d0ccec6c999547b1bce1f3e3b0b430a147f