Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9
am: 58def3804c  -s ours

Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d