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: a92810a1  -s ours am: 9be12f89 am: 03b0f5c3 am: 7b814065  -s ours am: 9080d446 am: 75c7391a am: f6361752 am: 7586e03e  -s ours" into nyc-dev am: 5f5403de am: d8ffc623 am: 710c5ea5 am: 586fa0ce" into nyc-mr1-dev-plus-aosp
am: e9875806  -s ours

Change-Id: Ia7427b2aa66c0b19e2d662d60004f9909e8618b6