Merge "Only apply legacy treatment on app icons that is targeting O" into ub-launcher3-dorval
am: 59c0e0e919  -s ours

Change-Id: I3a73996d1a753388bbafd3352dbda5fc5f506bc7