Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev am: 32e6da5b84
am: ea02035c4d  -s ours

Change-Id: I8c9cbbf10e1058180bdbb127d9657c4f6fe9c886