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: 5e403681" into nyc-mr1-dev-plus-aosp
am: 804df8db  -s ours

Change-Id: I577d8e0f27f9efe44267e2d51c7b1fd1157aa3b6