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

70a76a61bf95741f76b17fc78a8d784ae57dd481
Bug: 151611270
Change-Id: I16e0afcda998d2b1293ff47a66d5562fa4da77dc
224 files changed