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

Change-Id: Ie5287b8e3c27ae48c513fed6111cab8914cac4dc