Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending...

Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea9  -s ours am: f368bdee am: f21534a2 am: dfc2d0a4  -s ours am: 603a69ff am: 97194798 am: c35a9fed am: 71933abb  -s ours am: 02ba5ef8 am: 26fa4042 am: c16baae1 am: c4443243" into nyc-mr1-dev-plus-aosp
am: 2360e2a8  -s ours

Change-Id: If80948de9d7b7a1dd9e5283e5333e9dc9f9f1641