Merge "Make AdaptiveIconDrawable to read in config_icon_mask at non boot time"