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 am: b02862c2 am: dd0be992 am: 117a3830  -s ours am: 368ae62e am: 1d513c84 am: 5eed3c9c am: a106b521  -s ours" into nyc-dev am: 4ee46e5b am: fda97bed am: af4f11bd am: e18ec512" into nyc-mr1-dev-plus-aosp
am: 9e2f76ca  -s ours

Change-Id: Ie327388f9c0d230c16d03a4356c2b40a5133fd21