Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b  -s ours am: 6a9490f850 am: 380d9b9486 am: ea35f92f98 am: d5be8af093" into nyc-mr1-dev-plus-aosp
am: f5b9d2c881  -s ours

Change-Id: Id3330d1ed4ad5779eb5694f409bad67a3da69952