Merge \"Remove relayouts b/29945805\" into ub-launcher3-calgary
am: 7111a26813

Change-Id: I0156d8f0b69609dda7be16add216f08e8e5056f7