DO NOT MERGE: Allow launcher icon to be config'd in overlay. am: 24cd592b24
am: 1552895f55  -s ours

Change-Id: Ic8916aee1861f93883c51afe9da1b09a7eb1a467