Merge "Clear pending activity launches when force stop package" am: 00b678dd2d am: 5b65b132b3 am: 8b1f60a993
am: b2d9a6f723  -s ours

Change-Id: I6f3e064f3a23f9619f0dc4ac9cf5bcfadd564165