Merge "Add LAUNCHER3_SPRING_ICONS feature flag b/34841763" into ub-launcher3-dorval-polish
am: 1153e9eb89

Change-Id: I905acca335e99f0fe2fe7b0c750766d052665b02