Merge "Remove Square icon shape from system image Bug: 136084719 Test: builds" into qt-r1-dev am: 262a2fcb73
am: 483cd542d4

Change-Id: I9ae81f733b1db73bf7ff9b7cbf543062909f564c