Merge "Change launcher and shortcut icons to MaskableIconDrawable Test: manual test on Launcher3 Bug: 33034275 Bug: 35431198"