Merge "Change MaskableIconDrawable to AdaptiveIconDrawable"