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

Merge "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" into nyc-dev am: 555fbf30 am: 80f80e7e" into nyc-mr1-dev-plus-aosp
am: 88b04cfa  -s ours

Change-Id: I55bae4f188f635fccd8de4a21f92a958f26373ef