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

Change-Id: Iadfb448dd5d00928f23be75a654719089d675856