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

Change-Id: Ibee7d985bb52fef3199042dece38beb2e14bb1ea