Merge "Change Android default icon b/35314247 Test: manual" into oc-dev