Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev