[automerger skipped] [DO NOT MERGE] Fix NPE caused by an install flow where we decode the LauncherActivityInfo but we don't fill in the data Intent. am: 4783545808
am: 9e8ea6f064 -s ours
am skip reason: subject contains skip directive

Change-Id: I40ad496fe923997599f3ee0b8b6b17932d591ef4