[DO NOT MERGE] Making various icon shape options as non-translatable
am: 1f5a264fac  -s ours

Change-Id: I296898126ce981103bc8b7e5b8dee58f7c9e0e72