Merge "Merge "Add Hexagon (Victor) shape to icon shape overlay (will show up...
Merge "Merge "Add Hexagon (Victor) shape to icon shape overlay (will show up in custom options)" into rvc-dev am: ab2c1bb0 am: 00127b1e" into rvc-d1-dev-plus-aosp am: 278604e6 am: 64d65921
Change-Id: Ib57663d9b6e40aa9c2b8b93e41884222cfb52bce