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

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 am: 4a3caefd am: f7259775 am: 216e40b9 am: 30257527" into nyc-mr1-dev-plus-aosp
am: e9d9c2ea  -s ours

Change-Id: Ib60d904f1fe0a000f3546a9f4e3c0d1ad2592e25