Fix adding apps to lockscreen targets without explicit icon selection.

Change-Id: I28c5a2fb72aabd892cc861d592ef20bcbf9fb891
Merge "Fix adding apps to lockscreen targets without explicit icon selection." into jellybean-mr2.1