Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19 am: 38568aff am: af63dabf Change-Id: I3e0df515908b03ff5af350d21f9e113d6606f0b4