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

cb7d9dd362ad64026cfb376c1d9f8142565bcba6
Bug: 151611270
Change-Id: I45ac2c8f0210cbf86ecc49514ac0f5cabdae002a
35 files changed