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

Change-Id: I7a80c68f227d2596f3863b9f234d31a7143ca33c