Display user specified icon if android:icon has value, otherwise shows default. Fixes: 138965988 Test: manual test Change-Id: I78771103e52bd2b10aeae312d354fce27ec436fb