Merge "Fix AdaptiveIconDrawable#getAlpha"