Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b  -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06  -s ours am: 4a3caefd6c am: f7259775d8 am: 216e40b926 am: 3025752705" into nyc-mr1-dev-plus-aosp
am: e9d9c2eafa  -s ours

Change-Id: Ib60d904f1fe0a000f3546a9f4e3c0d1ad2592e25