Revert^2 "Merging from ub-launcher3-master @ build 6294827"

1bf6938f399db2a78d4be735160262009811502b
Bug: 151611270
Change-Id: If4ca7f9a479a8b0b26c19fcaff2349dca9af8f41
1 file changed