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

Change-Id: I4ddc8198a5b786aea177303492b17f6ec119f6de