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-mr1-dev am: 5e55214a am: c8aedeea am: 26bb7bf8  -s ours am: 86ac88cc am: 2490679d am: 2f664374 am: bc5775c1  -s ours am: 6a9490f8 am: 380d9b94 am: ea35f92f am: d5be8af0" into nyc-mr1-dev-plus-aosp
am: f5b9d2c8  -s ours

Change-Id: Id3330d1ed4ad5779eb5694f409bad67a3da69952