Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180  -s ours am: b6cc1acb63 am: b6813f24ae am: 1c6048e697 am: 995980b3a1" into nyc-mr1-dev-plus-aosp