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

Change-Id: Ie9996ca6a1197dbaf877229c932eba758e15eb5d