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

Change-Id: I002dd3afdbbdfe2db2fc42a4139936c198dccdac